Autogenerated HTML docs for v1.8.2-230-g2bba2
diff --git a/RelNotes/1.8.2.1.txt b/RelNotes/1.8.2.1.txt index e77f833..2397756 100644 --- a/RelNotes/1.8.2.1.txt +++ b/RelNotes/1.8.2.1.txt
@@ -4,6 +4,45 @@ Fixes since v1.8.2 ------------------ + * "git submodule update", when recursed into sub-submodules, did not + acccumulate the prefix paths. + + * "git am $maildir/" applied messages in an unexpected order; sort + filenames read from the maildir/ in a way that is more likely to + sort messages in the order the writing MUA meant to, by sorting + numeric segment in numeric order and non-numeric segment in + alphabetical order. + + * When export-subst is used, "zip" output recorded incorrect + size of the file. + + * Some platforms and users spell UTF-8 differently; retry with the + most official "UTF-8" when the system does not understand the + user-supplied encoding name that are the common alternative + spellings of UTF-8. + + * "git branch" did not bother to check nonsense command line + parameters and issue errors in many cases. + + * "git update-index -h" did not do the usual "-h(elp)" thing. + + * perl/Git.pm::cat_blob slurped everything in core only to write it + out to a file descriptor, which was not a very smart thing to do. + + * The SSL peer verification done by "git imap-send" did not ask for + Server Name Indication (RFC 4366), failing to connect SSL/TLS + sites that serve multiple hostnames on a single IP. + + * "git index-pack" had a buffer-overflow while preparing an + informational message when the translated version of it was too + long. + + * Clarify in the documentation "what" gets pushed to "where" when the + command line to "git push" does not say these explicitly. + + * In "git reflog expire", REACHABLE bit was not cleared from the + correct objects. + * The "--color=<when>" argument to the commands in the diff family was described poorly.
diff --git a/RelNotes/1.8.3.txt b/RelNotes/1.8.3.txt index 54b05db..b027992 100644 --- a/RelNotes/1.8.3.txt +++ b/RelNotes/1.8.3.txt
@@ -62,9 +62,10 @@ * The new "--follow-tags" option tells "git push" to push relevant annotated tags when pushing branches out. - -Foreign Interface - + * "git mergetool" now feeds files to the "p4merge" backend in the + order that matches the p4 convention, where "theirs" is usually + shown on the left side, which is the opposite from other backend + expects. Performance, Internal Implementation, etc. @@ -75,6 +76,10 @@ hashtables they use upfront, but still started from a small table repeatedly growing and rehashing. + * The API to walk reflog entries from the latest to older, which was + necessary for operations such as "git checkout -", was cumbersome + to use correctly and also inefficient. + Also contains minor documentation updates and code clean-ups. @@ -121,7 +126,6 @@ * In "git reflog expire", REACHABLE bit was not cleared from the correct objects. - (merge e8e92e0 jc/maint-reflog-expire-clean-mark-typofix later to maint). * The logic used by "git diff -M --stat" to shorten the names of files before and after a rename did not work correctly when the @@ -136,7 +140,6 @@ * Clarify in the documentation "what" gets pushed to "where" when the command line to "git push" does not say these explicitly. - (merge cfe1348 jc/maint-push-refspec-default-doc later to maint). * The "--color=<when>" argument to the commands in the diff family was described poorly. @@ -161,14 +164,12 @@ to file scope static, but a few functions in graph.c were used by CGit from sideways bypassing the entry points of the API the in-tree users use. - (merge ac751a0 jk/graph-c-expose-symbols-for-cgit later to maint). * "git update-index -h" did not do the usual "-h(elp)" thing. * "git index-pack" had a buffer-overflow while preparing an informational message when the translated version of it was too long. - (merge 5c3459f nd/index-pack-l10n-buf-overflow later to maint). * 'git commit -m "$msg"' used to add an extra newline even when $msg already ended with one. @@ -177,15 +178,12 @@ * The SSL peer verification done by "git imap-send" did not ask for Server Name Indication (RFC 4366), failing to connect SSL/TLS sites that serve multiple hostnames on a single IP. - (merge 698a1ec ob/imap-send-ssl-verify later to maint). * perl/Git.pm::cat_blob slurped everything in core only to write it out to a file descriptor, which was not a very smart thing to do. - (merge 712c6ad jc/perl-cat-blob later to maint). * "git branch" did not bother to check nonsense command line parameters and issue errors in many cases. - (merge 8efb889 nd/branch-error-cases later to maint). * Verification of signed tags were not done correctly when not in C or en/US locale. @@ -195,19 +193,15 @@ most official "UTF-8" when the system does not understand the user-supplied encoding name that are the common alternative spellings of UTF-8. - (merge 5c680be jk/utf-8-can-be-spelled-differently later to maint). * When export-subst is used, "zip" output recorded incorrect size of the file. - (merge d3c1472 rs/zip-compresssed-size-with-export-subst later to maint). * "git am $maildir/" applied messages in an unexpected order; sort filenames read from the maildir/ in a way that is more likely to sort messages in the order the writing MUA meant to, by sorting numeric segment in numeric order and non-numeric segment in alphabetical order. - (merge 18505c3 jk/mailsplit-maildir-muttsort later to maint). * "git submodule update", when recursed into sub-submodules, did not acccumulate the prefix paths. - (merge 75bf5e6 we/submodule-update-prefix-output later to maint).
diff --git a/git-sh-setup.html b/git-sh-setup.html index 7585b01..856c001 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html
@@ -872,6 +872,17 @@ GIT_AUTHOR_EMAIL and GIT_AUTHOR_DATE variables for a given commit. </p> </dd> +<dt class="hdlist1"> +create_virtual_base +</dt> +<dd> +<p> + modifies the first file so only lines in common with the + second file remain. If there is insufficient common material, + then the first file is left empty. The result is suitable + as a virtual base input for a 3-way merge. +</p> +</dd> </dl></div> </div> </div> @@ -885,7 +896,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-03-26 15:45:07 PDT </div> </div> </body>
diff --git a/git-sh-setup.txt b/git-sh-setup.txt index 6a9f66d..5d709d0 100644 --- a/git-sh-setup.txt +++ b/git-sh-setup.txt
@@ -82,6 +82,12 @@ outputs code for use with eval to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL and GIT_AUTHOR_DATE variables for a given commit. +create_virtual_base:: + modifies the first file so only lines in common with the + second file remain. If there is insufficient common material, + then the first file is left empty. The result is suitable + as a virtual base input for a 3-way merge. + GIT --- Part of the linkgit:git[1] suite
diff --git a/git.html b/git.html index 91bcb0b..0946630 100644 --- a/git.html +++ b/git.html
@@ -2548,9 +2548,12 @@ If this environment variable is set then <em>git fetch</em> and <em>git push</em> will use this command instead of <em>ssh</em> when they need to connect to a remote system. - The <em>$GIT_SSH</em> command will be given exactly two arguments: - the <em>username@host</em> (or just <em>host</em>) from the URL and the - shell command to execute on that remote system. + The <em>$GIT_SSH</em> command will be given exactly two or + four arguments: the <em>username@host</em> (or just <em>host</em>) + from the URL and the shell command to execute on that + remote system, optionally preceded by <em>-p</em> (literally) and + the <em>port</em> from the URL when it specifies something other + than the default SSH port. </p> <div class="paragraph"><p>To pass options to the program that you want to list in GIT_SSH you will need to wrap the program and options into a shell script, @@ -2740,7 +2743,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-03-13 12:06:29 PDT +Last updated 2013-03-26 15:45:07 PDT </div> </div> </body>
diff --git a/git.txt b/git.txt index 7efaa59..4307d62 100644 --- a/git.txt +++ b/git.txt
@@ -774,9 +774,12 @@ If this environment variable is set then 'git fetch' and 'git push' will use this command instead of 'ssh' when they need to connect to a remote system. - The '$GIT_SSH' command will be given exactly two arguments: - the 'username@host' (or just 'host') from the URL and the - shell command to execute on that remote system. + The '$GIT_SSH' command will be given exactly two or + four arguments: the 'username@host' (or just 'host') + from the URL and the shell command to execute on that + remote system, optionally preceded by '-p' (literally) and + the 'port' from the URL when it specifies something other + than the default SSH port. + To pass options to the program that you want to list in GIT_SSH you will need to wrap the program and options into a shell script,
